warning fixes in shapelib. From Alexander Stohr.

diff --git a/gpsbabel/shapelib/shapefil.h b/gpsbabel/shapelib/shapefil.h
index f5bfeafe528115554d90859f04d6ccffa47b91cb..41b83b277bce229f9c6f16a67ce2b525f1af3e2c 100644 (file)
--- a/gpsbabel/shapelib/shapefil.h
+++ b/gpsbabel/shapelib/shapefil.h
@@ -2,7 +2,7 @@
 #define _SHAPEFILE_H_INCLUDED
 
 /******************************************************************************
- * $Id: shapefil.h,v 1.1 2004-09-20 17:22:55 robertl Exp $
+ * $Id: shapefil.h,v 1.2 2004-09-27 01:13:58 robertl Exp $
  *
  * Project:  Shapelib
  * Purpose:  Primary include file for Shapelib.
@@ -37,6 +37,9 @@
  ******************************************************************************
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/20 17:22:55  robertl
+ * Bring in shapefil.h.
+ *
  * Revision 1.26  2002/09/29 00:00:08  warmerda
  * added FTLogical and logical attribute read/write calls
  *
@@ -296,11 +299,11 @@ void SHPAPI_CALL
 SHPObject SHPAPI_CALL1(*)
       SHPCreateObject( int nSHPType, int nShapeId,
                        int nParts, int * panPartStart, int * panPartType,
-                       int nVertices, double * padfX, double * padfY,
-                       double * padfZ, double * padfM );
+                       int nVertices, const double * padfX, const double * padfY,
+                       const double * padfZ, const double * padfM );
 SHPObject SHPAPI_CALL1(*)
       SHPCreateSimpleObject( int nSHPType, int nVertices,
-                             double * padfX, double * padfY, double * padfZ );
+                             const double * padfX, const double * padfY, const double * padfZ );
 
 int SHPAPI_CALL
       SHPRewindObject( SHPHandle hSHP, SHPObject * psObject );

diff --git a/gpsbabel/shapelib/shpopen.c b/gpsbabel/shapelib/shpopen.c
index 78fdbab06bd3b5927d4bbef3b5716212e8ab1923..8910eedcc08d26e190d00534f26b7d66d8baf30e 100644 (file)
--- a/gpsbabel/shapelib/shpopen.c
+++ b/gpsbabel/shapelib/shpopen.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: shpopen.c,v 1.1 2004-09-20 17:21:22 robertl Exp $
+ * $Id: shpopen.c,v 1.2 2004-09-27 01:13:58 robertl Exp $
  *
  * Project:  Shapelib
  * Purpose:  Implementation of core Shapefile read/write functions.
@@ -34,6 +34,9 @@
  ******************************************************************************
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.1  2004/09/20 17:21:22  robertl
+ * Check in shapelib and experimental prototype of crude shapefile support.
+ *
  * Revision 1.39  2002/08/26 06:46:56  warmerda
  * avoid c++ comments
  *
@@ -159,7 +162,7 @@
  */
 
 static char rcsid[] = 
-  "$Id: shpopen.c,v 1.1 2004-09-20 17:21:22 robertl Exp $";
+  "$Id: shpopen.c,v 1.2 2004-09-27 01:13:58 robertl Exp $";
 
 #include "shapefil.h"
 
@@ -786,8 +789,8 @@ SHPComputeExtents( SHPObject * psObject )
 SHPObject SHPAPI_CALL1(*)
 SHPCreateObject( int nSHPType, int nShapeId, int nParts,
                  int * panPartStart, int * panPartType,
-                 int nVertices, double * padfX, double * padfY,
-                 double * padfZ, double * padfM )
+                 int nVertices, const double * padfX, const double * padfY,
+                 const double * padfZ, const double * padfM )
 
 {
     SHPObject  *psObject;
@@ -895,8 +898,8 @@ SHPCreateObject( int nSHPType, int nShapeId, int nParts,
 
 SHPObject SHPAPI_CALL1(*)
 SHPCreateSimpleObject( int nSHPType, int nVertices,
-                       double * padfX, double * padfY,
-                       double * padfZ )
+                       const double * padfX, const double * padfY,
+                       const double * padfZ )
 
 {
     return( SHPCreateObject( nSHPType, -1, 0, NULL, NULL,